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