Merge branch 'js/t3920-shell-and-or-fix' into maint-2.39