am ba8af498: Merge "Reduce logspam by catching unexpected types ourselves." into lmp-preview-dev

* commit 'ba8af498f08d4ac2e7712a8d307d24112ca1bc8e':
  Reduce logspam by catching unexpected types ourselves.