CON-2183: comments - small breakpoint issues

Please add TODO annotation - to remove this hack when we implement miniEditor in right way.