Freeze break request: fix for branching from packages with multiple heads