DAR-3116 | Fix after conflict in merge