Dummy merge from 3.2, as that approach to resolving #6074 is not applicable to importlib