DOL-98 : todo comment removed.