Merge branch 'fix/fallback-config' into 'develop'