Upgrade to SDK version 0.0.21 to complete repo migration