Fix incorrect option name.
Merge branch 'develop' into interactive_fallback