feat(SW-3127): use new sort order attribute * feat(SW-3127): use new sort order attribute Approved-by: Erik Tiekstra