I'd vote to fix the scalingup issue in a dedicated pr.