Adds changes from #1837 to all products and versions#1867

Merged

ctauchen merged 1 commit intotigera:mainfrom ctauchen:follow-up-1866

Feb 4, 2025

+864

Commits on Jan 30, 2025

Adds changes from GH#1837 to all products and versions
ctauchen
committed