Fix display of delegates' name
Merge branch 'develop'