Merge "Run the animators together" into nyc-dev