Merge I7a39770c,Ia0c1d81c into jb-mr1