Merge branch 'SCHOLAR-3.x' into 4855-finetune
Merge branch '4855-finetune' into 4855-ui