Fixes several bugs and improves auth bundle
Merge branch 'origin/master'