Merge pull request #16120 from alalek:python3.8