Merge "Potential fix for bug 7352816" into jb-mr1-dev