Move the OPTIONS shortcut to after respond exists.
Merge commit 'da24c2d0cd150c77b164dc1817f8ea00f40b3abc' into mvc