Don't append "config" if not needed
Merge branch 'topic/command-line-flags'