........S. [ZBX-8092] code improvement
.......... [ZBX-7098] removed development branch