Task/13214 + refactoring