Merge into jb-mr1-dev

Change-Id: Ib0523ded92e2fe4be6a32d092baa55b527229c07