BZ-9999: Merge projectToECM branch to the master