Merge remote branch 'remotes/nyergler/issue-680-csrf-optout'