Merge "Ensure Build is always usable on Ravenwood ..." into main