Merges Multiple Credentials API #383

This has been merged manually.