Fix #1666, also enrich child items with the branch name so we don't have to pass the  everywhere