Stupidity
Merge remote-tracking branch 'upstream/mr1-3.4' into jb4.2