Fix OPTIONS / SETUP call order
Merge branch 'dev'