Update to version 2.2.21