Merge "Revert "Compat-framework on ravenwood"" into main