Merge "Add logging to compat override calls" into main