Merge "Increase type widths to satisfy width requirements" into integration