Merge branch 'bw-uniq-listtx' into bw-deployment