Merge "Sorting and merge Emergency number better" into qt-dev