Merge branch 'chore/config-descriptions' into 'develop'