DAR-2885 | Changes after CR