Merge "Ripple radius bug" into sc-dev