Merge pull request #1132 from etimberg/feature/v2.0dev-xy

Scale rewrite for v2.0