merge in mc-proxy code