Sort material types alphabetically for extended search.
Merge branch 'feature' into merge