"MDL-19118, improve comments management"