Modified files after last merge to get GuiFocusTreeTest to run