Merge branch 'develop' into remoting-4.0