version 2.1 eMVe branch