Parent window fix
Merge branch 'meatballs/pr2602' into ext_server_extapi