merge in lmp-mr1-release history after reset to 584dbee59ceb7750e22c48371342635aa6a98517
tree: 73fec1d772d508d6521341f5c1a13aeea34cf035
  1. client/
  2. include/
  3. server/