master
BAEL-20663: Fix usage of org.springframework.data.domain.Sort
Merge pull request #8125 from eugenp/revert-8119-BAEL-3275-2