merge the crashlog feature from r22305, r22326