Merge from my 710pre2 bril bhm