merge in lmp-release history after reset to 322528314be96c1f9f50c72fa11003b209ad0a36