Improve the functions to move - refs BT#8105