Merge "Refactor and override creation of the async sorting task"