Merge "Add some extra config data used for validation" into 24D1-dev