main
High DPI monitor breaking changes (#33645)
Update definitions to correlate with table columns (#33117)