Merge "Make skip_checks and setup_creds safe"