Also, along the same lines, the commit message says "> 5.7", but this logic here is ">= 5.7" (&& < 6)