autoscaling support Ref #470 & Ref #469