Merge branch 'release/3.0.13'
Merge tag '3.0.13' into develop

3.0.13