Merge branch 'patch/foreign-toplevel-management' into v0.6-a/patched-base
implement foreign toplevel management