Merge "[Ravenwood] Several minor fixes" into main