DOCS-1022 sort heterogeneous type -- need to backport