Merge "Specify explicit actions for bubble / unbubble"