Fix for #7260.
Fix for #7261.
Fix for double definition.