Fetch default_format directly in order to avoid breaking the registry. bugid:110611
Merge branch 'develop' into release-6.0rc2