[REFACTOR] @0.40 refs #35787 Refactored way rules are executed once
again