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