Update vbuf and vbufm aliases to merge feature with develop or master.