This picks up the change to feature test against order bugs. (cherry picked from commit 468901c336)
468901c336