T189220: Ensure that relevant extensions are MCR-aware

From mcr