Merge branch animation-iter4