Add missing fields in config.dist.json
Merge remote-tracking branch 'origin/some-new-stuff' into some-new-stuff