OPAL-2188: Using ComparisonChain
Merge pull request #399 from emorency/OPAL-2188-Sort-Files

OPAL-2188: Using ComparisonChain