Fix merge to cookie-auth from master.