Merge tag 'v3.0.2' into stable

v3.0.2 release