Merge branch 'move-to-luna' into remoting-4.0