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