Merge tag 'v3.0.4' into stable

v3.0.4 release