Merge MOVES work into deployment branch