Combine multiple answers when displaying in profile
Merge branch 'MH-1034' into dev