changes to support autoscaling Ref #470 & Ref #469