release 3.4.11
Merge branch 'release/3.4.11' into develop