Merge "Remove unnecessary permissions checks" into main