Merge "Fix exception sorting conversations" into sc-dev