Merge MMVA development version