26004 Sort changes

Made changes to sort directive in toolbox. 
This PR is coupled to the same branch name in method for issue 26004. 

@texasag @prabinv @kevinsproles & @tsanko for completeness
Can you remove the commented out code. If we need it later, we can always get it from git.