Issue #2925689 by alexpott: ConfigValidation class contains code that is brittle and changing for every addition