feature #2989: Fix merge of 2989
feature #2917. Add vm information