Merge "Add permission checks"