Rolling AP Upgrade – Step 7 Fixed