Merge "Update bubbles to be default true and add update step"