Update to 2.2.4-dev