merge in lmp-release history after reset to 3dfd372f9f4f74e4adaba614669f9f5894a54f81