Merge branch 'dk-list-comments-improvements' of gitlab.syncad.com:hive/hivemind into dk-list-comments-improvements