Merge branch 'master' into linnea
Merge and changes to samples
Merge branch 'linnea'