Merge "Yet another attempt to fix (issue 6282761)" into jb-dev