Fix for #7260.
Fix for #7261.
Fix for double definition.
Fix for #7285.
Merge pull request #7271 from Segrain/dev-freeze

Dev-freeze fixes.