Update to 0.8.4 of CLI