Merge "Fix worlddump log collection"