Partial Fix #5560 - Gitlive - branching wip