merge the patch from upstream/feature2013_04_remoting