Same changes to Vector and Vector control.
See 1408b04dbb6ca8ca323dd73629af6e2c3d9292d9