Merge "Delete time/position in InjectDelete instead of Delete_all" into pi-dev