Fixed focus issues and removed the "ugly" 50 milli timeout
Merge branch 'master' into temp-build
Temp build