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

* commit '426aed2ad2c0f9b46cbcd85231c489a2f292b0cf':
  Fix to make repeated lingerings work.