.......... [ZBXNEXT-2124] merge from trunk
.......... [ZBX-7850] removed development branch