Merge "Change default dump format to JSON"