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