[PATCH 12 of 31] Better handle late upstream creation