Merged mshubin changes on TileManager