Added r4770 from /tags/modified-shop-1.06 to trunk and added old vatic status check as fallback in code