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