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