Merge "Maybe fix issue #5340190: java.lang.RuntimeException: Unable to start..."