Merge "Fix ripple clipping + quick rejection"