Update to 0.8.4.-2.2