Merge "Add more data stall recovery info"