Merge branch 'bcmgenet_systemport'