Merge "[Ravenwood] Cleanup JVM workarounds" into main