Merge branch 'rj/no-sign-compare' into maint