Merge master into sarray-capacity-overflow