Merge "Improve dump format" into qt-dev