merge in lmp-release history after reset to cc9c005472000cc2f26361bb66074c31292e10ef