Merge "vector: Additional enhancements and fixes"