Merge branch 'update/changelog-3.6' into 'master'

Merged Timo Koch requested to merge cherry-pick-48600841 into releases/3.6

Merge request reports