Sorted list updated for new protocol
Merge branch 'ND-SortedUpdate' into ND-BatchRefactor