Migration to 8.5: Big integers