merge latest Bubbles code with main branch