Merge "Prepare for compat-framework support" into main