Merge remote-tracking branch 'cr/jb2' into jb-mr1

Change-Id: I4e09a401723014f9e090949d8cc6dfcc7e325e1e