Made some fixes.
Merge branch 'frontend-animation-integration'