Merge branch 'cherry-pick-f8a17a54' into 'releases/3.5'

Merge branch 'fix/use-discretization-tag' into 'master'

See merge request !188
1 job for releases/3.5
latest