Merges in credentials branch.