Pre-populate sections in config? Fixes #4519