F2891979

F2891979: move-unedited.diff