Changes in SpriteManager
Merge