Move merged attribute to clearwater, and correctly reference quiesced attribute