DAR-3115 | Changes after CR