v0.21.0 Update for candidate.6