Merge "Add flag for retrievable bubbles" into main