Version 2.12.0
Merge branch 'release/v2.12.0' into develop