distro-3.9: update distro configs
Merge branch 'distro-3.9' into pf-3.9