nvda

a06e3455 - Reintroduce code from PR #11856

Reintroduce code from PR #11856 This reverts commit 619e5f735b08f6e33abe60a93bcbb10cada1cfcd. Additionally re-enable and update tests so expectation matches behaviour.