Merge branch 'jc/abbrev-autoscale-config' into maint