porting master to release

@Praburaj @glennc 

Porting master to release since it was behind in terms of commits. Will be adding more updates to release branch later and merging to master for beta2
This is not the `kvm` in the dev branch? Asking because I made some changes in the dev branch about 3 weeks ago and I don't see them here...