Merge "Fix sorting of Sample-type packages" into eclair