CON-2183: comments - small breakpoint issues