[backport] Incorporate changes from master

Merged Timo Koch requested to merge update/release-3.7 into releases/3.7

Merge request reports