Merge "DO NOT MERGE Add permission checks before delivery" into rvc-qpr-dev