Add customOrder
and disableOptimalOrderHeuristic
#263
+13
−4
Merged