Merge branch 'saveSamplePoints' into 'master'

Save sample points

See merge request !21
3 jobs for master in 10 minutes and 21 seconds (queued for 2 seconds)