Merge "[Ravenwood] Tweak build files" into main