[Vm-dev] Some VMMaker updates, CPP generation and Mantis 5238 fix