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