Merge branch 'bcmgenet_eee'