Merge "Merge from ECOMP's repository"