imran|BDSHR-95|build fail fix