Merge "Fix ripple in GA" into rvc-dev