am c90173f6: am 2620499a: Merge "Fix to make repeated lingerings work." into lmp-dev

* commit 'c90173f6eb4104c46ffcce7f55895b9a43f1a750':
  Fix to make repeated lingerings work.