Merge "Fix issues introduced /w migration to Credentials"