Merge "Add missing permission enforcement." into sc-dev