Merge "Remove obsolete multitree directory" into main