Merge "Fix issues #16941902, #16901402, and #16135174." into lmp-dev