Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev