Merge branch 'fix/generate-parameters-py' into 'master'

Merged Timo Koch requested to merge cherry-pick-66a68e60 into releases/3.7

Merge request reports