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