Merge autosize branch changes.