DAR-2629 | After CR