merge in lmp-release history after reset to 2ce3d5c4ae4e5eb20d4e76931947a02bd54c3101