Merge "Adding TimeAnimator capability (hidden for now)"