Software release branch and trunk part 2