fix #3606396 Normalize comment data and make it more defensive.

Closes #3606396

Merge request reports

Loading