reorg for local sparkcore development