Merge changes Iac20cc7b,I87ce6320

* changes:
  Fixing potential issue with wrong task descriptions being loaded.
  Refactoring to AnimatedEvent.