SCHOLAR-3.18 update