Updated existing scaling content with autoscale information
Fixed merge conflict for PR #1423
Merge pull request #1425 from pennij/working_mon0617

Fixed merge conflict for PR #1423