It's probably safest to be able to quickly disable the scaleup logic via a parameter in case it would trigger at a moment where we do not want it/expect it. Change-Id: I43e07a8fc46b915c570ecae61b0bc443e1bf9664