Merge into jb-mr1-dev

Change-Id: Iaee05ce2bc5103c46fe9a148ad166f694c246c2f