Re #1034 Fixing temporary the SugarCRM conflict.