Tracking changes for 4.7
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1