Merge "Add enforcement of idmap policies"