Partial commit for Flare Console