am 7631b257: Merge "A little more work on issue ##16907799." into lmp-dev

* commit '7631b257772e622b446b9c35112fe9ff0a596b17':
  A little more work on issue ##16907799.