nvda

Fix up of #15867 and other issues found during its investigation

#15906

Merged