Merge branch 'feature/update-description' into 'develop'