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