TMDM-7686: code refactoring
Merge branch 'maintenance/5.6'