Merge "Remove flag enable_dump" into main