Merge "Bubbles: fix some issues with the pointer" into sc-dev