Fix problem with new category without scale.
Merge remote-tracking branch 'origin/develop' into develop