Fixed basic auth issues.
Merge remote-tracking branch 'remotes/upstream/dev' into testing