Merge "Fix bug 6906134" into jb-mr1-dev