DAR-2604, fix leftovers after solving merge conflicts