Updated for v2.0.39 of sdk.