Merge "Update DND strings"