Merge "Enable NameNotFoundException on Ravenwood" into main