Merge "Fixing vector element alignment issues."