Merge "Animator stuff" into lmp-dev