Changes pre 1.8.4 release