Merge "SF: replace dont_skip_on_early flag" into main