EHO-62 refactoring and removing intermediate lock dto