Repack with latest SDK to be compatible with 22 and 23