Fix silly mistake that slowed operation
Finalize config file format & rename.
Merge remote-tracking branch 'origin/master' into rd.features