Merge "Fix ripple cancel"