updated sort key generation..
Merge branch 'newdev' into test