Merge branch 'bcm7xxx_workaround'