stable merge from bitbucket