.......... [ZBXNEXT-282] merge from trunk
A......... [ZBXNEXT-219] minor code improvements