Merge fixes

Change-Id: I5b16070e710c1c6fdbcdad1ae20405bbb26c7f96
Merge remote-tracking branch 'bc/jb-mr2' into jb-mr2