Merge "Fold "host-dir-parent" into "parent-dir""