Merge "Don't check OverrideAllowedState" into rvc-dev