(BugId:97399) - Don't add sortkey by default.
Merge branch 'bugid-97399' into dev