..F....... [ZBXNEXT-2073] minor code refactoring