Add Test to point out the focus issue
Test
Fix merge
Merge remote-tracking branch 'origin/issue-window-focus' into develop