Merge remote branch 'magnus/bug6002-sample-data' into new/enh/bug_6002