Proxy implementation for Window version
Merge branch 'master' into junk/static-simulation