Intermediate tab focus fix
Merge branch 'master' into ST3