DOCS-4063: $comment support