Updating 1.8.5 for reflecting recent changes