Issue-440 - fixed
Merge branch 'Issue-440-composition-and-sample-save-issues' into current-sprint