Merge branch 'docs/fix-config.md' into 'develop'