reverted wix changes due to major upgrade problems
added async session server
merged engine upstream