Merge "Bug 40756 - API: Call to a member function isGood() on a non-object in ApiDele...