TODO comment elaboration and other prep for in-place make-move method in core
Merge remote-tracking branch 'github/master'