merge in lmp-mr1-release history after reset to 4c95a125e0930c112555437589f7620575482095
tree: d7ea3681e0bb8d9036536279352ced736d80140c
  1. client/
  2. include/
  3. server/