Merge "Update of names of branches and targets for trunk stable." into main