Merge "[BUG] Dminame to valid topic suffix"