Merge "Fix #62350081 - annotate permission requirements" into oc-dev