manual merge branch 2.5.x-doc