Removed all references to ecm in the base objects
Merge remote-tracking branch 'origin/master'