Merge "Revert "DO NOT MERGE: Revert "Make CheckOp return allowed if any..."" into sc-dev