Merge "Fixed a documentation Bug (Issue 9236)"