Merge "Fixes the unstable sort by using Long.compare instead of casting long to int." into mnc-docs