distro-3.8: update distro config, stage 2/2
Merge branch 'distro-3.8' into pf-3.8