Update to 4.2.21