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

* commit '323792313e6fd43b1f32ae7358e46d07c5df0cb7':
  A little more work on issue ##16907799.