[Skunkworks] Bind issue - Upgrade