Merge branch 'remoting-4.0' into develop