Merge "Add permission checker service"