Merge branch 'contrib_goto_focus'