[PATCH 0/2] Fix MST with downstream branches