Merge "Fix issue #7215984: java.lang.RuntimeException: Unable to create..." into jb-mr1-dev