Merge "Ripple UX feedback" into sc-dev