Merge "Fix issue #10876433: java.lang.IllegalStateException in..." into klp-dev