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