Update to 0.21.1