disabling auth for now
Merge remote-tracking branch 'upstream/master'
Bringing on disabled auth changes