Release 3.0.1.3
Merge branch 'release/3.0.1.3' into develop