Merge changes from topic "revert-19245451-revert-2022-20240-VLEDXGPPND" into sc-qpr1-dev

* changes:
  [automerge] Revert "DO NOT MERGE: Revert "Make CheckOp return allowed if any..." 2p: f21335c469
  Revert "DO NOT MERGE: Revert "Make CheckOp return allowed if any..."