Adding some bits for backup stuff (JIN-99), JIN-101, JIN-102 and not update the whole VM when its state changes
Merge branch 'test' into dev