[BUG #7246] Handle multiple branches