Merge "Fix ripple radius calculation" into sc-dev