enhanceio-3.9: update against 3.9 tree
Merge branch 'enhanceio-3.9' into pf-3.9