Prepare for upgrade to 8.1