Merge "Introduce Euphrates main changes"