Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev