secure-window-handle-replacement7905 (Rob Hartmann)

Following