Changes after the SDK upgrade