Merged changes [71328-71362] Bug fix for ticket #5482. Made library default for compare-ordering customizable.