Update for v-2.3.4