Merge "Fix issue #7211769 and #7244492, thrash around on #7226656." into jb-mr1-dev