Merge branch 'feature/simple-diffusion' into 'master'

Merged Timo Koch requested to merge cherry-pick-8a701244 into releases/3.7

Merge request reports