Merge "Fix issue #17375172...   sshhhhhh!!!" into lmp-dev