Merge "[Ravenwood] Cleanup and update RavenwoodEnvironment" into main