.......... [ZBX-8532] updated to latest from trunk