Merge "Remove miniresolver header elevation" into 24D1-dev