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

* commit '34b11487d16a060ec36599f289bb37235ada75d7':
  A little more work on issue ##16907799.