Merge branch 'amf/object_creation' into sprint58