ENYO-3600: resolve confilct resulting from the merge with master.