Namefix.
Topic fix.
Fix for #7365.
Merge pull request #7383 from Segrain/dev-freeze

Dev-freeze fixes.