Merge "[Catalyst] Introduce IntRangeValuePreference" into main