..F....... [ZBX-8339] refactored, reverted to initial behaiviour