Re-applying lost commit from 5.7-alf for altering column-size