SDK upgrade 9