Update for 1.8.4 release