DDBNEXT-811: Comment Favorites Part 1
Merge branch 'DDBNEXT-811-hla-comments' into develop