[elm_bubble] merge upstream