Merge vmc and cf-runtime changes