Merge "Rewrite lingering." into nyc-mr1-dev