..F....... [ZBX-8241] refactored as requested