4.2.1_r1.2
Merge remote-tracking branch 'upstream/jb-ras-mr1' into jb-ras-mr1