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