Merge "Revert "Fix AppOps collection bug."" into rvc-dev