[FEATURE] Fallback paths (backport from Flow)