Software release branch and trunk part 3