Merge animation changes to master