Rolling AP Upgrade – Step 5 Fixed