Re-order for 1.8 release.