Merge branch 'save_samplepoints' into 'master'

Save samplepoints

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