Merge branch 'hotfix/change-descriptions' into develop