enhanceio-3.8: sync with git tree
Merge branch 'enhanceio-3.8' into pf-3.8