Merge "Doc update: fix broken code sample" into jb-mr1.1-docs