make changes from #4293 against SCHOLAR-3.9 #4194

#4194 

This PR is identical to #4293 but against **SCHOLAR-3.9**, not SCHOLAR-3.x.

For functional changes, see commit e54af019