Merge "Remove phrase_strict_fallback flag" into main