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