#1020: #950: updates to comment anchors as per tracking sheet

opened by njr2128