Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'develop'