(cherry picked from commit e850f39526)
e850f39526
* Collapse unsupported previous version entries * drop the last entry in the matrix test (cherry picked from commit f57950a3c9)
f57950a3c9