updated documentation
Merge branch '2.4' into develop