Invalid XML in documentation
Merge branch 'release/2.3.3' into development