Merge branch 'bw/kwset-use-unsigned' into maint