.......... [ZBX-7981] updated to latest from trunk
.......... [ZBX-7890] created alternative development branch