DAR-2525 CR changes