Upgrade to r21.1 of SDK