DAR-2627 | After CR change