Resolve "Comments issues"

Merged Piotr Gawron requested to merge 457-comments-issues into devel_12.0.x

Closes #457 (closed)

Merge request reports