Merge "Add additional permission check"