Merge "Clat dump information improvement"