Merge animations during reimport
Merge branch '_reimport_anim_merge'
Keep function callbacks, no throwing errors
Merge branch '_reimport_anim_merge'
Merge branch 'source'