Update to vendor version 0.6