Merge issues with "add_field_permission" rename