Added support for animations
Merge
Revert "Merge"

This reverts commit 4bf9fb95a5616b61039791e792cdea241c3c7d04.
Revert "Revert "Merge""

This reverts commit c3a6870592a110b7bba5a2c9236a612a5a23aa99, reversing
changes made to 4bf9fb95a5616b61039791e792cdea241c3c7d04.