Merge "Show ripples in QQS." into pi-dev