(cherry picked from commit 3881179f723ce21986ba8a683ef5ab9d851e7aae) # Conflicts: # crm/api/__init__.py