merging dev to release-0.8.10 to incorporate vm command changes