ZSS-418:
 * workaround by disabling the code for modification of comments
 * add test case