Merge "Only check op in Settings UI" into rvc-dev