Merge branch 'Xanvia/ShoR' into 4.3.4

Close pull request #9071