Merge tag 'v3.0.3' into stable

v3.0.3 release