Merged animation adjustements from Xperience1080