.......... [ZBX-3163] updated to the latest trunk