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

* commit '2620499ad2dcb2c0891c85ab32f86a5c7823d336':
  Fix to make repeated lingerings work.