Merge pull request #1208 from etimberg/feature/v2.0-scale-refactor

Radial scale improvements