Update to version v2.3.11
Merge branch 'release/2.3.11' into develop