Animation
Merge origin/master
Transparency
Merge origin/master