Merge into jb-mr1-dev

Change-Id: I5a9970a011de789aaeb1c4c4ed58ae750071b135