Merge "Fix broken DUN evaluation logic"