fix: Import of objects
Merge branch 'freeze' into develop