Merge branch '17295_discussion_note' into 'master'
Fixes missing avatar on system notes
Closes #17295

See merge request !4954
(cherry picked from commit 9e8fdead)