Squashed commit of the following: Updates for VMC
commit bf93ea1cfa43195e6bcfdc57de8ba2cad07b80d9
commit 1a2e74bb42cac0c222846e48a694ae2f715a4da7
commit 8b6635802baf73b2dcf7132676a758055ad77964
commit dae41b02170289a5ada3327d90202274e5203455
commit 516fcb42ad75e391fecfeabcbf49794b2c8d7508
commit 7e42731313698eca626c4a231fae67f402bc0e12
commit 1906e2ed8cee1ac0094e393665cdb10ea1001582
commit 692a627526152a7e08289db90f1847edc6a1f708
commit b94f2dbaf76d277d11a7aff175562c5733210583
commit 0b7f061e5d364f24f40ac2bbaa284d5bf96aefa1
commit f09c483d9887ebe19d26b4e4320fcc8ba2b29807
commit 87bdb137d82ee494d8e41ac9f475018d93bcd10d