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

* commit '785d764bd56b2d41216aa52ab8f6b6af9179f9c9':
  More on issue #12031685 (DO NOT MERGE)