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