Merge branch 'kg/http-auth' into next