Merge branch 'save_samplepoints' into 'master'

Save samplepoints

See merge request !32
3 jobs for master in 15 minutes and 18 seconds (queued for 1 second)