Mote merges from remote-tracking branch