Merge pull request #3948 from klauskiwi/for_2.6.1

[Doc] Few Documentation updates for 2.6.y