Merge "Rewrite lingering." into nyc-mr1-dev
tree: 98dd05fed37b9e0e1b42709430f135aae09fc4ca
  1. core/
  2. services/
  3. tests/