Merge branch 'sg/skip-skipped-prereq'