[TAC-58] last changes for edition refactoring