Merge "docs: fix for bug 3186839"