(3rd attempt) Merge branch 'SCHOLAR-3.x' into 2290-comment-sources