merge mvsm-master