Merge "Remove miniresolver header elevation" into main