DAR-592: Changes after CR