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