Merge "docs: fix bug 7628699" into jb-mr1-dev