Merge "Animator refactoring & fixes"