(cherry picked from commit 03abe0b5cd24e3a9e7bcdfdb17f701b53026db4f) # Conflicts: # crm/api/__init__.py