Merge "Set correct task remove mode when reparenting" into oc-dev