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