Merge "Debug issue #10876433 java.lang.IllegalStateException..." into klp-dev