Add VM notifications
Add VM notifications.
Clean the code.

M
Merge branch 'testing' into addVMnotifications