Merge "Revert^2 "Enable new ripple"" into sc-dev