merging stable branch to build branch