Merge "refine _get_isolated_creds"