Patches and tests for 2.2i4