Merge "Fix location dumping" into main