Merge branch 'bcmgenet-cleanups'