Added change from #740 into new config options