HH-43310 improve comment merging