Merge branch 'descriptions-fixes' into 'develop'