Revert "Revert "BDD local changes""

This reverts commit af0729105d87fe0a07c3eba9e989f940afdd9f19.