Prep for bpoweski-cluster merge