[TS-2683]: Additional config enhancements per Leif's suggestions