Merge "Credentials Configuration changes"