Merge tag 'v2.8.4' into knewton

v2.8.4