Merge "Documentation Bug (Issue 9557)"