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