Version bump to 6.0.21
Version bump to 6.0.22 (for development)