Merge 2.4 into master

Original pull requests:

* #2640 from a-wi:2.4
* #2659 from adrians:docs_pull_1