CON-2183: comments - small breakpoint issues

Added in  5a2e1ac