Merge branch 'bf/improved_basis_interp' into 'master'

Bf/improved basis interpolation

See merge request !41
3 jobs for master in 20 minutes and 47 seconds (queued for 1 second)