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