Merge "Fix dont_skip_on_early_ro to be read only again" into main