Revert "BD 11"

This reverts commit bd234c179ea69a80bff35585114c58f2a8c57bf6.
Revert "Revert "BD 11""

This reverts commit c31cfc5cada5d1d5069e72c72769a22a2c9e50c0.