merged some animation fixes from ETPub and ETPro