Rebase v2_4 onto master after the release.

Merged Marcin Godzina requested to merge v2_4 into master

Rebase v2_4 onto master after the release.

Merge request reports