DAR-2553 | Chnages after BB CR