Further work on the focus issue.

Build 1.7.2
Merge branch 'Development'