Simpler inlines.
Merge branch 'develop' into interactive_fallback