stable change from bitbucket_dev