HAL-493: Apply patch wizard stuck on patch application step