Merge branch 'la/strvec-comment-fix' into maint-2.43