DDBNEXT-811: Comments in favorites
Merge branch 'DDBNEXT-811-hla-comments3' into develop