Merge "Workaround undocumented AppOps behavior" into sc-v2-dev