Merge "Correct a permission check / add a test"