Merge branch 'feature/separate-extended-richards' into 'master'

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

Merge request reports