Merge remote-tracking branch 'refs/remotes/origin/teamup-override-3-RangeEditWindow'