Merge into jb-mr1-dev - do not merge

Change-Id: I3582e3a68c6c38569884e9a903b5230bf890e7fa