CON-2183: comments - small breakpoint issues
Add a TODO to implement it a bit better
Merge pull request #5513 from Wikia/CON-2183

CON-2183: comments - small breakpoint issues