Merge "Land bubbles softly" into sc-dev