Updated a missing merge from 1.11 to get smart config working