Merge branch 'bcm_sf2'