Merge from ECOMP's repository