TS-3178: Maintain backwards compatability with old config