Fixed up bad fallback chain
Merge branch 'bug/regression.engine.fallbacks'
Release 0.17.3