merge bd into master