Merge branch 'jb_2.5' into jb-mr1

Change-Id: I608d20833133a0aed7be7f3fcc291af8371790e6