Merge branch 'dump-changes-bug'