Using single variable
Fixed wrong end time bug
Merge remote-tracking branch 'origin/support_for_animations' into next

* origin/support_for_animations:
  Fixed wrong end time bug
  Using single variable