Merge "Fix ripple alpha." into tm-qpr-dev