Backport changes from master to 2.12 branch

Merged Julian Brost requested to merge feature/backport-2.12 into 2.12

This MR backports the changes done to the master branch to the 2.12 branch.

The MR was generated by the following command:

git cherry-pick \
  87c09af62dbb2541d70cc7da0619e25d03b2b25c \
  67f23037189fa81e4263075c797071e90544a89f \
  561de21fea1b3724eac45648a53f7e8e6080aedd \

Backport of these MRs:

Merge request reports