BDR-1248

BDR-1248