Merge "Merge commit '95274a40' into manualmerge" into jb-mr2-dev