Merge "Add feature flag for phrase -> strict fallback" into main