#16940: fix indentation in example.
#16940: merge with 3.2.
#16940: merge with 3.3.