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