Merge "Bug 260 - Termination Logic for Scaled Instances" into v2.0