Update to version 8.4