* Merged changes from upstream
* Set custom move function back