........S. [ZBX-8555] refactoring