[codiag] partial commit for bubble freezing (#15)