Merge branch 'mg/http-auth'