HHH-8264 Bind new @SortNatural and @SortComparator