Merge "Handle suppressed bubbles" into main