Documentation changes (.rst files and examples)
on-merge: backport to v3.6.x
on-merge: backport to v3.6.2-doc