Merge branch 'animator_refactor'