Updated existing scaling content with autoscale information
Fixed merge conflict for PR #1423