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

3.0.12