Update to 2.2.1 experimental