Squash and cherry-pick PR #4811 #4731

#4731 

##### Hotfix against SCHOLAR-3.11

See also #4811