Merge "Make clear data stricter." into lmp-dev