A......... [ZBXNEXT-219] code refactoring