Merge "bug fixes in animation classes"