Merge "Fix bug 6499508" into jb-dev