WEB-8 disable comments and related...