am 8dead81f: Merge "Code cleaning" into lmp-preview-dev

* commit '8dead81f3b1548d0d3f84a585b389baf8d415e99':
  Code cleaning