Feature/sort dictonary keys

Fixed in 8622944