Merge "Fix ripples not going away" into sc-dev