Fix the focus always
Merge branch 'patched' into patched-release
New build