Merge branch 'develop'

export focus function.