remove unused initialCapacity
Merge remote-tracking branch: upstream/master