Merge "Run in Python 3.8"