Merge "Revert "Create non-bypassable op restrictions"" into sc-dev