Merge "[Ravenwood] Remove usage of RavenwoodConfig" into main