Merge "refactor the part to get credential file"