2885 comment sources make for SCHOLAR-3.5

**Merge into SCHOLAR-3.5**

#2885