Update to 3.6.21