Merge "Permission clean up: use noteOp where necessary" into rvc-dev