Cherry-pick commits for python 3.12

The imp module is removed in Python 3.12. The second commit required --strategy-option=ignore-space-change to cherry-pick cleanly.

Merge request reports

Loading