DAR-1485 | Bugfix after merges