Merge branch 'linksbrowser_menu'