Merge "Fix faint ripple" into tm-dev