Cherry pick live scrubbing from master