final changes for the milestone of the release