Merge "Fix for bug 8578258." into jb-mr2-dev