Merge into jb-mr1-dev

Change-Id: I2e1eee6976ef4682c9f8daffed699ee4c59060c3