Merge branch 'ab/dedup-config-and-command-docs'