Updates for v2.8.4