Merge branch 'cleanups-pep' into dt-test