auth auth complete
merge master with upstream
fix merge conflicts