Merge "Use vector instead of VLA to avoid uninitialized values"