#1035: #1034: removed all xml-comments and updated comment-tracking
opened by njr2128