DAR-1498 Added important TODO