TRUNK-4436: Use nullSafeEquals in Order