Merge "Judge skip conditions in skip_checks instead of in resource_setup"