split upgrade 0008 into two parts