Merge branch 'mohr/extendedExpression' into 'master'

Adds test for interpolation with extended expression

See merge request !516
29 jobs for master in 104 minutes and 20 seconds (queued for 2 seconds)