nvda

Address misleading garbage handler warnings and fix another reference cycle

#11552

Merged