Update doc
Merge remote-tracking branch 'origin/3.3' into 3.3_backported