Add focus set/get
Merge branch 'add-focus-setget'