Merge branch 'feature/8094_one_atom_SetSampleMaterial' into develop
Merge branch 'feature/7429_splatterplot_4D_data' into develop
Merge branch 'feature/7429_splatterplot_4D_data' into develop