Merge branch 'wx/merge-ort-comment-typofix' into maint-2.42