Merge into jb-mr1-dev

Change-Id: Idc74e8e0f3cea76b995f4262428006949708ce32