am 7903c6a2: Merge "Make clear data stricter." into lmp-dev

* commit '7903c6a263354506ace10fc32aa65c231b64f62b':
  Make clear data stricter.