Merge "Fix crash on dump()"