Clean makeobj
Fix check for objects
Merge branch 'michel_2641_makeobj' into next