Merge branch 'cascade-integration' into usability-issues
hotfix for preview scaling
optimizations
Merge branch 'usability-issues' into cascade-integration