Version bump to 2.2.21