Merge "Implement phrase->non-phrase fallback" into main