Merge VMMaker.oscog-eem.333 in UnixAioPlugin too