Merge "Add test coverage for a bug in the lingering code." into nyc-mr1-dev
tree: e39bcc0d738cf4df520d9d468929acb64d3bc8c1
  1. core/
  2. services/
  3. tests/