Merge proposals

VM development team has no merge proposals.