Merge branch 'obi/bcm_accel'