Merge "docs: fix for bug 5057581"