Merge branch 'descriptions-changes' into 'develop'