merge in lmp-release history after reset to 998fbbfb259b7f0e37ea4c4cb2429ce90d7fe34d