release v8.4.0: Same bug fixed elsewhere