some changes in the release branch