Revert "DAR-3116 | Fix after conflict in merge"

This reverts commit 13c88f921a110f05114f68b3421316ffd1dc98d5.
Revert "Merge remote-tracking branch 'origin/dev' into DAR-3115"

This reverts commit d8007225231f0ae1f56e3a18a980749ffcb7d467, reversing
changes made to 499db03784717c61caa6e0f5342d05c4c4123f93.