#9373: [Diplom] Comment feature broken
Merge branch 'version-4.6' of ssh://github.com/bilandia-fg/diplom into version-4.6