Merge branch...

Merge branch 'feature/ff-pm-coupling-allow-different-discretizations-easy-to-read-commit-history' into 'master'

[ff-pm-coupling] allow different discretization schemes

See merge request !3620