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