Adapt to latest HPA schema change