Merge "Fix to make repeated lingerings work." into lmp-dev