Merge branch 'descriptions-fix' into 'develop'