..F....... [ZBX-1215] refactored deprecated code / approach