Merge "Ignore "use pre-dump" flag if no data is available" into main