Merge "Add a permission check to a stubbed method" into sc-dev