Merge "Working on issue #6561352: java.lang.RuntimeException: Unable to start..." into jb-dev