.......... [ZBX-7856] merged from upstream
.......... [ZBX-7856] removed development branch