Rolling in config tweaks from 2.5 branch