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