Merge "A little more work on issue ##16907799." into lmp-dev