Merge "Part of fix for bug 8629392" into jb-mr2-dev