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