tools: save/restore object type too
tools: save/restore object type too

dbartolini/crown,mikymod/crown,galek/crown,mikymod/crown,mikymod/crown,mikymod/crown,dbartolini/crown,dbartolini/crown,galek/crown,galek/crown,dbartolini/crown,galek/crown