Merge "Add test coverage for a bug in the lingering code." into nyc-mr1-dev