Merge branch 'AnimationTexture' into my-dev