more config tweaks
Merge branch 'master' into v2.14