Merge "Prepare skip_checks as stable interface"