A......... [ZBX-6174] minor code refactoring