Merge "Further Credentials-related clean-up"