Merge branch 'fc/doc-default-to-upstream-config'