Merge note bdd into master