Merge "SF: minor bug fix to flags::dont_skip_on_early" into main