Merge into jb-mr1-dev

Change-Id: Ic72c475635a0eb57a77d3bd621a219001af8baa5