Fix memory leak.
Merge topic 'linked-usage-cleanup' into next

85ba2fd Fix memory leak.